From 18751432cad6f7fe1abd68403c852087adc58470 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 13 Sep 2009 17:41:57 -0700 Subject: [PATCH] Don't fail to build if info dir or dir.old doesn't exist (use rm -f). --- debian/changelog | 8 +++++++- debian/rules | 7 ++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6660863a434..782cb82f084 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,13 @@ emacs23 (23.1+1-4) unstable; urgency=low Debian files. Thanks to Michael Biebl for the report. (closes: #541173) - -- Rob Browning Sat, 05 Sep 2009 21:12:12 -0700 + * Handle the fact that the share/info/emacs-VER/dir{,.old} files may + not be created during the install (and so may not need to be + removed). This may be the case with dpkg 1.5.4 or newer. Thanks + to Sven Joachim for the report and the + fix. (closes: 545379) + + -- Rob Browning Sun, 13 Sep 2009 16:49:33 -0700 emacs23 (23.1+1-3) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 773cf4a7c3d..d7d1802d416 100755 --- a/debian/rules +++ b/debian/rules @@ -781,9 +781,10 @@ install: debian/stamp/build $(autogen_install_files) $(pf); cd $(pkgdir_common) && \ find -name "*.elc" | perl -pe 's/\.elc$$/\.el\.gz/o' | xargs rm -f - # Remove extraneous info dir file. - rm $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir - rm $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir.old + # Remove extraneous info dir files. These may not exist if dpkg + # is 1.5.4 or newer. + rm -f $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir + rm -f $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir.old # Remove the shared game score directory to as a simple way to avoid # a conflict with other flavors of Emacs. Since Debian's -- 2.30.2